gesture: Add grouping API

This API eliminates the need for overriding
GtkWidget::sequence-state-changed virtually everywhere. Grouped
gestures share common states for a same GdkEventSequence, so the
state of sequences stay in sync across those.

diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c
index 49a1de085cd1cad7f5a68abe20cda012a902905f..f287ce151a1d8741fc6d9f5d39ce1258012d4cdd 100644 (file)
--- a/gtk/gtkgesture.c
+++ b/gtk/gtkgesture.c
@@ -58,6 +58,7 @@ struct _GtkGesturePrivate
   GdkWindow *user_window;
   GdkWindow *window;
   GdkDevice *device;
+  GList *group_link;
   guint n_points;
   guint recognized : 1;
 };
@@ -554,6 +555,8 @@ gtk_gesture_init (GtkGesture *gesture)
                                         (GDestroyNotify) g_free);
   gtk_event_controller_set_event_mask (GTK_EVENT_CONTROLLER (gesture),
                                        GDK_TOUCH_MASK);
+
+  priv->group_link = g_list_prepend (NULL, gesture);
 }
 
 /**
@@ -1169,6 +1172,94 @@ gtk_gesture_set_window (GtkGesture *gesture,
   g_object_notify (G_OBJECT (gesture), "window");
 }
 
+GList *
+_gtk_gesture_get_group_link (GtkGesture *gesture)
+{
+  GtkGesturePrivate *priv;
+
+  priv = gtk_gesture_get_instance_private (gesture);
+
+  return priv->group_link;
+}
+
+void
+gtk_gesture_group (GtkGesture *gesture,
+                   GtkGesture *group_gesture)
+{
+  GList *link, *group_link, *next;
+
+  g_return_if_fail (GTK_IS_GESTURE (gesture));
+  g_return_if_fail (GTK_IS_GESTURE (group_gesture));
+  g_return_if_fail (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (group_gesture)) ==
+                    gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)));
+
+  link = _gtk_gesture_get_group_link (gesture);
+
+  if (link->prev || link->next)
+    {
+      if (gtk_gesture_is_grouped_with (gesture, group_gesture))
+        return;
+      gtk_gesture_ungroup (gesture);
+    }
+
+  group_link = _gtk_gesture_get_group_link (group_gesture);
+  next = group_link->next;
+
+  /* Rewire link so it's inserted after the group_gesture elem */
+  link->prev = group_link;
+  link->next = next;
+  group_link->next = link;
+  if (next)
+    next->prev = link;
+}
+
+void
+gtk_gesture_ungroup (GtkGesture *gesture)
+{
+  GList *link, *prev, *next;
+
+  g_return_if_fail (GTK_IS_GESTURE (gesture));
+
+  link = _gtk_gesture_get_group_link (gesture);
+  prev = link->prev;
+  next = link->next;
+
+  /* Detach link from the group chain */
+  if (prev)
+    prev->next = next;
+  if (next)
+    next->prev = prev;
+
+  link->next = link->prev = NULL;
+}
+
+GList *
+gtk_gesture_get_group (GtkGesture *gesture)
+{
+  GList *link;
+
+  g_return_val_if_fail (GTK_IS_GESTURE (gesture), NULL);
+
+  link = _gtk_gesture_get_group_link (gesture);
+
+  return g_list_copy (g_list_first (link));
+}
+
+gboolean
+gtk_gesture_is_grouped_with (GtkGesture *gesture,
+                             GtkGesture *other)
+{
+  GList *link;
+
+  g_return_val_if_fail (GTK_IS_GESTURE (gesture), FALSE);
+  g_return_val_if_fail (GTK_IS_GESTURE (other), FALSE);
+
+  link = _gtk_gesture_get_group_link (gesture);
+  link = g_list_first (link);
+
+  return g_list_find (link, other) != NULL;
+}
+
 gboolean
 _gtk_gesture_handled_sequence_press (GtkGesture       *gesture,
                                      GdkEventSequence *sequence)

diff --git a/gtk/gtkgesture.h b/gtk/gtkgesture.h
index e5976d1381c286e6e251ace8984a01cdd8e2dfdd..762dde7ddb2820131c2d35a379ceef3ff39f2572 100644 (file)
--- a/gtk/gtkgesture.h
+++ b/gtk/gtkgesture.h
@@ -136,6 +136,19 @@ GDK_AVAILABLE_IN_3_14
 void        gtk_gesture_set_window           (GtkGesture       *gesture,
                                               GdkWindow        *window);
 
+GDK_AVAILABLE_IN_3_14
+void        gtk_gesture_group                (GtkGesture       *group_gesture,
+                                              GtkGesture       *gesture);
+GDK_AVAILABLE_IN_3_14
+void        gtk_gesture_ungroup              (GtkGesture       *gesture);
+
+GDK_AVAILABLE_IN_3_14
+GList *     gtk_gesture_get_group            (GtkGesture       *gesture);
+
+GDK_AVAILABLE_IN_3_14
+gboolean    gtk_gesture_is_grouped_with      (GtkGesture       *gesture,
+                                              GtkGesture       *other);
+
 G_END_DECLS
 
 #endif /* __GTK_GESTURE_H__ */